From: Carlos Garnacho <carlosg@gnome.org>
Date: Sat, 23 May 2015 13:51:11 +0000 (+0200)
Subject: scrolledwindow: Refactor scroll unit guessing into a separate function
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~6780
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fc2830394895f236352bea2024dda0e962dd2c53;p=gtk%2B3.0.git

scrolledwindow: Refactor scroll unit guessing into a separate function

Makes it clearer, and will be used in further places.

https://bugzilla.gnome.org/show_bug.cgi?id=749770
---

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 24e9a6ff27..4e62efccf7 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1084,6 +1084,36 @@ check_update_scrollbar_proximity (GtkScrolledWindow *sw,
   return indicator_close;
 }
 
+static gdouble
+get_scroll_unit (GtkScrolledWindow *sw,
+                 GtkOrientation     orientation)
+{
+  gdouble scroll_unit;
+
+#ifndef GDK_WINDOWING_QUARTZ
+  GtkScrolledWindowPrivate *priv = sw->priv;
+  GtkRange *scrollbar;
+  GtkAdjustment *adj;
+  gdouble page_size;
+
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    scrollbar = GTK_RANGE (priv->hscrollbar);
+  else
+    scrollbar = GTK_RANGE (priv->vscrollbar);
+
+  if (!scrollbar)
+    return 0;
+
+  adj = gtk_range_get_adjustment (scrollbar);
+  page_size = gtk_adjustment_get_page_size (adj);
+  scroll_unit = pow (page_size, 2.0 / 3.0);
+#else
+  scroll_unit = 1;
+#endif
+
+  return scroll_unit;
+}
+
 static gboolean
 captured_event_cb (GtkWidget *widget,
                    GdkEvent  *event)
@@ -2976,17 +3006,10 @@ gtk_scrolled_window_scroll_event (GtkWidget      *widget,
         {
           GtkAdjustment *adj;
           gdouble new_value;
-          gdouble page_size;
           gdouble scroll_unit;
 
           adj = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
-          page_size = gtk_adjustment_get_page_size (adj);
-
-#ifdef GDK_WINDOWING_QUARTZ
-          scroll_unit = 1;
-#else
-          scroll_unit = pow (page_size, 2.0 / 3.0);
-#endif
+          scroll_unit = get_scroll_unit (scrolled_window, GTK_ORIENTATION_HORIZONTAL);
 
           new_value = priv->unclamped_hadj_value + delta_x * scroll_unit;
           _gtk_scrolled_window_set_adjustment_value (scrolled_window, adj,
@@ -2999,17 +3022,10 @@ gtk_scrolled_window_scroll_event (GtkWidget      *widget,
         {
           GtkAdjustment *adj;
           gdouble new_value;
-          gdouble page_size;
           gdouble scroll_unit;
 
           adj = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
-          page_size = gtk_adjustment_get_page_size (adj);
-
-#ifdef GDK_WINDOWING_QUARTZ
-          scroll_unit = 1;
-#else
-          scroll_unit = pow (page_size, 2.0 / 3.0);
-#endif
+          scroll_unit = get_scroll_unit (scrolled_window, GTK_ORIENTATION_HORIZONTAL);
 
           new_value = priv->unclamped_vadj_value + delta_y * scroll_unit;
           _gtk_scrolled_window_set_adjustment_value (scrolled_window, adj,